From a20ce1761a12153d517e17e40d6a601cd02b4784 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 19 Sep 2021 12:18:06 +0100 Subject: [PATCH] javadoc-optional Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gbp-Pq: Name javadoc-optional.diff --- Repository.mk | 2 +- configure.ac | Bin 513868 -> 514587 bytes odk/CustomTarget_check.mk | 2 +- odk/Module_odk.mk | 6 ++++-- odk/util/check.pl | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Repository.mk b/Repository.mk index b05d9772bcf..61a136129f9 100644 --- a/Repository.mk +++ b/Repository.mk @@ -859,7 +859,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ offapi_idl \ udkapi_idl \ $(if $(ENABLE_JAVA), \ - odk_javadoc \ + $(if $(JAVADOC),odk_javadoc) \ odk_uno_loader_classes \ ) \ )) diff --git a/configure.ac b/configure.ac index 3f7c289db197c699a340b0bc406c5f3588e0507c..d7fee685817b49465b16b22648833bd7f83d3392 100644 GIT binary patch delta 608 zcmX@JPJZ?l`Gzfw+;O~I3P2E@l~|UTlAk`#S5r@dQ2>%vN}{)AtkdoF)1gtSRp+%FSRJKBr`uxAwNyQ-^E)2rdV?NfmlY( z=`#L|#&FYK#xSbMgWV9TqXTgZ$m)2gv9^_|#j)*wVi|#$35c1u|A}Q;A}pAi2eK?a zKP6j9LD5zrFMs;~C>E{hxn)co)AO#ga!sFqiAiGm|NShy)87=ah{>ep6sK}=W~M2W zq!yPbD5)UZF?pe&%yhXT7USv9g4y_{M;EcEP4_y&#yh>Mh(&d}!d^Dk=^Khz8`~rM$?zuF$+&G zNN44n-k;7aGFiY|e!6S{&_xG|Sq!E-^a7pwp_oN+x>X&E`1AyAR+i~9B`k*1Ss$~A zOui+|Gd;G1#di8RLx?i=>3I*C*n@4AfB~We4ku8&fk0X&7pDTmf1C=XdBv$E3SN$3 zjxPSrKyjcXR1H`Kh>fZwEpz&*5*8^5M9@Grdj`9E0nGpgj<_7U7A{BU_~1~d;1CUv V;`aL`EI`Z(#BAH|m$2t10RUBG#s>fZ delta 258 zcmbQeMgGh>`Gzfw+;Qz|;u(RM35c1uuZd@wDm=X^pG9T5z#&$S>9)66xu!c@VUn1B z?hp&_^v%UA(vxdsIHog}uozG8EMSqC9#8@#_7|`SO|L6qk(pM+!ZLkP35)b}t}rH% z>2Hs*a7}+)!Xh=@Tbh+`y1p_K?{wKx7V*gkmh(;bDrGU8KAn$EaJoSzv&eLVH7w%O z&zG{;g3XX9W09Tio4~?9J*139cltJCCV}Y-%UEoMy&S_FUHqLrgWbJ=l&w-_YVq{M n39O>BPzg;gN9Xw9P^aJ!4J4)Q>&jVxm=%cGwy!H^&rJdVYlBq) diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 6477ad71e8c..c23343a027e 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \ $(call gb_Package_get_target,odk_docs) \ $(call gb_Package_get_target,odk_html) \ - $(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ + $(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) ifneq ($(gb_SUPPRESS_TESTS),) diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 16eba69c3e3..0d5fca58d2c 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -42,8 +42,10 @@ endif ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_classes \ - CustomTarget_javadoc \ - GeneratedPackage_odk_javadoc \ + $(if $(JAVADOC),\ + CustomTarget_javadoc \ + GeneratedPackage_odk_javadoc \ + ) \ GeneratedPackage_uno_loader_classes \ )) endif diff --git a/odk/util/check.pl b/odk/util/check.pl index be03d40ff58..bed51e1c7a6 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -184,7 +184,7 @@ if (-d "$SdkDir") { # improvement required my $solar_java = $ENV{"ENABLE_JAVA"}; my $JDK = $ENV{"JDK"}; - if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) { + if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") { print "check java docu: "; if (check_dir("docs/java/ref")) { if (!check_file("docs/java/ref/index.html")) { -- 2.30.2